Fonctionnalités "attestation de service public" et "labellisation france services" #580

tut-tuuut · 2022-03-17T10:49:11Z

🌮 Objectif

Alléger la fonctionnalité "attestation de service public" qui avait une grosse complexité pour une valeur ajoutée minime.
Affiner la fonction "labellisation france services"

🔍 Implémentation

Suppression du champ fichier "attestation de service public".
Ajout d'un champ "numéro d'immatriculation france services", qui apparaît si la case "labellisation france services" est cochée.

🖼️ Images

aidants_connect_habilitation/static/js/organisation_form.js

aidants_connect_habilitation/models.py

tut-tuuut · 2022-03-25T15:48:34Z

@christophehenry Ajouts récents : nettoyage du champ côté serveur + contraintes en base

tut-tuuut · 2022-03-28T07:39:44Z

aidants_connect_habilitation/forms.py

        required=False,
    )

-    public_service_delegation_attestation = FileField(


En attendant de savoir comment on réimplémente la fonctionnalité, j'ai carrément supprimé le champ.

tut-tuuut · 2022-03-28T07:40:23Z

aidants_connect_habilitation/forms.py

@@ -125,6 +126,20 @@ def __init__(self, **kwargs):
                "data-other-value": RequestOriginConstants.OTHER.value,
            },
        )
+        self.widget_attrs(


Attributs ajoutés sur les checkbox pour la gestion du JS

tut-tuuut · 2022-03-28T07:42:30Z

aidants_connect_habilitation/tests/factories.py

-    public_service_delegation_attestation = ""
-
-    france_services_label = FuzzyChoice([True, False])
+    france_services_label = False


J'arrête les FuzzyChoice dans les factories, parce que ça fait des FuzzyTests après… Et déjà comme ça ce fut compliqué :D

tut-tuuut · 2022-03-28T07:43:52Z

aidants_connect_habilitation/tests/test_functionnal/test_organisation_form.py

@@ -21,26 +21,27 @@

 @tag("functional")
 class OrganisationRequestFormViewTests(FunctionalTestCase):
-    def test_form_normal_organisation(self):
+    def test_form_normal_organisation_with_fs_label(self):
        issuer: Issuer = IssuerFactory()
        request: OrganisationRequest = OrganisationRequestFactory.build(
            type_id=RequestOriginConstants.MEDIATHEQUE.value,
            public_service_delegation_attestation=False,


NPPT : virer cette ligne

tut-tuuut · 2022-03-28T07:44:28Z

aidants_connect_habilitation/tests/test_views.py

@@ -308,7 +311,6 @@ def test_404_on_bad_issuer_id(self):
    def test_new_organisation_request_is_displayed_with_links(self):
        organisation = DraftOrganisationRequestFactory(issuer=self.issuer)
        response = self.client.get(self.get_url(self.issuer.issuer_id))
-        print(response.content)


Oups (c'était ma faute)

tut-tuuut · 2022-03-28T07:46:38Z

aidants_connect_habilitation/tests/test_views.py

+        cleaned_data.pop("is_private_org")
+        cleaned_data.pop("france_services_label")


Pour explication : sans ces lignes-là, c'est comme si j'avais is_private_org = True.

Une checkbox cochée dans un formulaire HTML, ça se détecte au fait que la clé est présente dans les données, quelle que soit la valeur associée.

tut-tuuut · 2022-03-28T07:47:39Z

aidants_connect_web/admin.py

-    def get_readonly_fields(self, request, obj=None):
-        readonly_fields = list(self.readonly_fields)
-        if obj and obj.data_pass_id:
-            readonly_fields.append("data_pass_id")
-        return readonly_fields
-


Hmm je ne sais pas ce que ça fait là, ça.

Et hop, j'ai supprimé le commit, lalala

needed = is_private_org is True

tut-tuuut commented Mar 17, 2022

View reviewed changes

aidants_connect_habilitation/static/js/organisation_form.js Show resolved Hide resolved

tut-tuuut commented Mar 17, 2022

View reviewed changes

aidants_connect_habilitation/static/js/organisation_form.js Outdated Show resolved Hide resolved

tut-tuuut added the Internaliser l'habilitation label Mar 18, 2022

tut-tuuut force-pushed the ahr/public-service-delegation branch from 3bd97a4 to c497efc Compare March 18, 2022 17:01

tut-tuuut marked this pull request as ready for review March 18, 2022 17:04

tut-tuuut changed the title ~~Diminution de la fonctionnalité "attestation de service public"~~ Fonctionnalités "attestation de service public" et "labellisation france services" Mar 18, 2022

christophehenry approved these changes Mar 21, 2022

View reviewed changes

christophehenry requested changes Mar 21, 2022

View reviewed changes

aidants_connect_habilitation/static/js/organisation_form.js Show resolved Hide resolved

christophehenry requested changes Mar 21, 2022

View reviewed changes

aidants_connect_habilitation/static/js/organisation_form.js Show resolved Hide resolved

christophehenry requested changes Mar 21, 2022

View reviewed changes

aidants_connect_habilitation/models.py Show resolved Hide resolved

tut-tuuut force-pushed the ahr/public-service-delegation branch from a6ead7c to 94e0c58 Compare March 24, 2022 16:41

tut-tuuut commented Mar 28, 2022

View reviewed changes

tut-tuuut force-pushed the ahr/public-service-delegation branch from 7153eb8 to 93aa9db Compare March 28, 2022 07:58

christophehenry approved these changes Mar 28, 2022

View reviewed changes

tut-tuuut added 9 commits March 28, 2022 14:36

Add and save database field "is_private_org"

b60b339

Display block "public service delegation" only if checkbox is checked

64de5e5

Add and stylish field "france services number"

c4196e2

Plug form "france services number" on JS

a29f571

Commit generated css files

480129b

Add tests for france_services and is_private_org

f1cf033

Add constraint on is_private_org and france_services_label

9342d69

Remove noisy print() in tests

38a21a2

Add migrations after rebase

8b713d1

tut-tuuut added 8 commits March 28, 2022 14:36

Fix tests broken with new constraints

8a84446

Clean partner_administration on server side if needed

17e189b

needed = is_private_org is True

Clear france_services_number if necessary

faf5b1c

Avoid errors in tests due to "None" in forms

0550fef

Avoid 500 due to MultiValueDictKeyError when checkbox is not checked

47c8de7

Adjust tests so they pass with new constraints

fba1301

Fix tests not dealing with checkboxes very well

972edfd

Clear references to public_service_attestation_delegation in tests

cabd264

tut-tuuut force-pushed the ahr/public-service-delegation branch from 89fa649 to cabd264 Compare March 28, 2022 12:36

tut-tuuut merged commit 9c492b4 into main Mar 28, 2022

tut-tuuut deleted the ahr/public-service-delegation branch March 28, 2022 12:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fonctionnalités "attestation de service public" et "labellisation france services" #580

Fonctionnalités "attestation de service public" et "labellisation france services" #580

tut-tuuut commented Mar 17, 2022 •

edited

Loading

tut-tuuut commented Mar 25, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

tut-tuuut Mar 28, 2022

		cleaned_data.pop("is_private_org")
		cleaned_data.pop("france_services_label")

Fonctionnalités "attestation de service public" et "labellisation france services" #580

Fonctionnalités "attestation de service public" et "labellisation france services" #580

Conversation

tut-tuuut commented Mar 17, 2022 • edited Loading

🌮 Objectif

🔍 Implémentation

🖼️ Images

tut-tuuut commented Mar 25, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tut-tuuut commented Mar 17, 2022 •

edited

Loading